Skip to content

Add details about merging pull requests#1808

Merged
nedbat merged 2 commits into
python:mainfrom
nedbat:nedbat/finish-prs
May 23, 2026
Merged

Add details about merging pull requests#1808
nedbat merged 2 commits into
python:mainfrom
nedbat:nedbat/finish-prs

Conversation

@nedbat
Copy link
Copy Markdown
Member

@nedbat nedbat commented May 23, 2026

From a discord discussion where I needed help knowing the steps and expectations: https://discord.com/channels/854719841091715092/854721045264203836/1507343600655269938

@read-the-docs-community
Copy link
Copy Markdown

read-the-docs-community Bot commented May 23, 2026

Documentation build overview

📚 CPython devguide | 🛠️ Build #32823517 | 📁 Comparing 618d5ed against latest (109d6d0)

  🔍 Preview build  

4 files changed
± index.html
± core-team/index.html
± versions/index.html
± core-team/committing/index.html

Comment thread core-team/committing.rst Outdated
Comment thread core-team/committing.rst Outdated
Comment thread core-team/committing.rst Outdated
Comment thread core-team/committing.rst Outdated
Completing the pull request
---------------------------

Once the pull request is ready, you (the core team member) bring it into main.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps

Suggested change
Once the pull request is ready, you (the core team member) bring it into main.
Once the pull request is ready, you (the core team member) merge it into main.

Comment thread core-team/committing.rst Outdated
Comment thread core-team/committing.rst Outdated
@nedbat
Copy link
Copy Markdown
Member Author

nedbat commented May 23, 2026

Thanks everyone, sorry for the misspellings! I was avoiding "merge" because it's actually a squash, but I think you are right the avoidance makes for awkward wordings.

@StanFromIreland
Copy link
Copy Markdown
Member

StanFromIreland commented May 23, 2026

I was avoiding "merge" because it's actually a squash

Technically, it's a squash and merge ;-)

image

Regular contributors can do squashes (which we don't like), but they can't merge.

@nedbat nedbat merged commit 87de350 into python:main May 23, 2026
5 checks passed
@nedbat nedbat deleted the nedbat/finish-prs branch May 23, 2026 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants